From 7d7da2ed3b87aab2a0890501f313bd2470c1e140 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Tue, 10 Dec 2013 07:36:36 +0400 Subject: [PATCH] * font.c (font_find_for_lface): Ensure SAFE_FREE on return. --- src/ChangeLog | 1 + src/font.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index e679c8a9b9e..787a9a21c33 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,6 +2,7 @@ * xdisp.c (display_tool_bar_line): Don't extend on a previously drawn tool bar items (Bug#16058). + * font.c (font_find_for_lface): Ensure SAFE_FREE on return. 2013-12-09 Ken Brown diff --git a/src/font.c b/src/font.c index ad604ebe744..fb56b3d3fb3 100644 --- a/src/font.c +++ b/src/font.c @@ -3209,7 +3209,10 @@ font_find_for_lface (struct frame *f, Lisp_Object *attrs, Lisp_Object spec, int val = font_select_entity (f, entities, attrs, pixel_size, c); if (! NILP (val)) - return val; + { + SAFE_FREE (); + return val; + } } } } -- 2.30.2